preparing a release candidate

31 files changed, 11682 insertions, 11160 deletions

diff --git a/ChangeLog b/ChangeLog
index 1341179a1..c367fe05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-18  Werner Koch  <[email protected]>
+
+	Release 2.0.15rc1.
+
+	* configure.ac: Remove double check for libassuan.
+
 2010-02-11  Marcus Brinkmann  <[email protected]>
 
 	From trunk 2009-10-16:
diff --git a/NEWS b/NEWS
index 215e74f10..d2e9f1efa 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Noteworthy changes in version 2.0.15 (unreleased)
  * Fixes a regression in 2.0.14 which prevented unprotection of new
    or changed gpg-agent passphrases.
 
+ * Make use of libassuan 2.0 which is available as a DSO.
+
 
 Noteworthy changes in version 2.0.14 (2009-12-21)
 -------------------------------------------------
diff --git a/README b/README
index 89520518b..2f5cb211a 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
                       =========================
                              Version 2.0
 
-      Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-        2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+        2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 
 INTRODUCTION
@@ -31,10 +31,10 @@ BUILD INSTRUCTIONS
 
 GnuPG 2.0 depends on the following packages:
 
-  libgpg-error    (ftp://ftp.gnupg.org/gcrypt/libgpg-error/)
-  libgcrypt       (ftp://ftp.gnupg.org/gcrypt/libgcrypt/)
-  libksba         (ftp://ftp.gnupg.org/gcrypt/libksba/)
-  libassuan < 2.0 (ftp://ftp.gnupg.org/gcrypt/libassuan/)
+  libgpg-error     (ftp://ftp.gnupg.org/gcrypt/libgpg-error/)
+  libgcrypt        (ftp://ftp.gnupg.org/gcrypt/libgcrypt/)
+  libksba          (ftp://ftp.gnupg.org/gcrypt/libksba/)
+  libassuan >= 2.0 (ftp://ftp.gnupg.org/gcrypt/libassuan/)
   
 You also need the Pinentry package for most function of GnuPG; however
 it is not a build requirement.  Pinentry is available at
diff --git a/configure.ac b/configure.ac
index f57f7c142..8b7f2c1ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac - for GnuPG 2.0
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008 Free Software Foundation, Inc.
+#               2006, 2007, 2008, 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GnuPG.
 # 
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.15])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.0.15rc1])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -43,7 +43,7 @@ NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.4.0
 
 NEED_LIBASSUAN_API=2
-NEED_LIBASSUAN_VERSION=1.1.0
+NEED_LIBASSUAN_VERSION=2.0.0
 
 NEED_KSBA_API=1
 NEED_KSBA_VERSION=1.0.2
@@ -613,9 +613,6 @@ AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
 AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
                   have_libassuan=yes,have_libassuan=no)
 if test "$have_libassuan" = "yes"; then
-  have_libassuan=no
-  AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
-                    have_libassuan=yes,have_libassuan=no)	
   AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
             [version of the libbassuan library])
 fi
diff --git a/po/be.po b/po/be.po
index 4f465f23d..5cf302960 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -15,14 +15,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -32,56 +44,56 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -91,7 +103,7 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -101,12 +113,12 @@ msgstr ""
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -161,7 +173,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -307,7 +319,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -318,262 +330,262 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -589,7 +601,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -598,9 +610,9 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -641,17 +653,17 @@ msgid ""
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
@@ -914,11 +926,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1588,9 +1600,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Загад> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1615,12 +1627,12 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1900,7 +1912,7 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1915,171 +1927,176 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr ""
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr ""
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "дрэнны пароль"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2087,7 +2104,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2107,11 +2124,11 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2121,7 +2138,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2129,547 +2146,552 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key user-id"
+
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -3423,8 +3445,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3797,7 +3819,7 @@ msgstr "Выйсьці не захаваўшы зьмены? "
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
@@ -3806,23 +3828,23 @@ msgstr ""
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3830,360 +3852,360 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 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:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 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:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -6809,70 +6831,70 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6887,21 +6909,21 @@ msgstr ""
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7480,11 +7502,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "дрэнны пароль"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr ""
@@ -7624,26 +7641,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr ""
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7675,7 +7692,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7815,7 +7832,7 @@ msgstr ""
 msgid "This is a qualified signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "quit [выйсьці]"
@@ -7848,57 +7865,57 @@ msgstr ""
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "пароль занадта доўгі\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -8125,7 +8142,7 @@ msgstr "грамадскі ключ ня знойдзены"
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8135,160 +8152,160 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr ""
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "зашыфраваць даньні"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [назва_файла]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "непадтрымліваецца"
@@ -8304,6 +8321,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Загад> "
+
 #~ msgid "Please report bugs to <[email protected]>.\n"
 #~ msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
diff --git a/po/ca.po b/po/ca.po
index 669694005..c471da69c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -35,14 +35,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -52,58 +64,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -113,7 +125,7 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -123,12 +135,12 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -183,7 +195,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -334,7 +346,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -345,269 +357,269 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, 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"
@@ -623,7 +635,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -632,9 +644,9 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -678,17 +690,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -957,11 +969,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1675,9 +1687,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Ordre> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1700,12 +1712,12 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -2014,7 +2026,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2030,177 +2042,182 @@ msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "genera un certificat de revocació"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "genera un certificat de revocació"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2211,7 +2228,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2231,11 +2248,11 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2250,7 +2267,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2258,566 +2275,571 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key user-id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -3642,8 +3664,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4056,7 +4078,7 @@ msgstr "Voleu eixir sense desar? "
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
@@ -4065,97 +4087,97 @@ msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4163,19 +4185,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4185,7 +4207,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4194,78 +4216,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4274,209 +4296,209 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 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:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7300,72 +7322,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7380,22 +7402,22 @@ msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -8009,11 +8031,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "canvia la contrasenya"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -8154,27 +8171,27 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8207,7 +8224,7 @@ msgstr "error en crear «%s»: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -8350,7 +8367,7 @@ msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
@@ -8384,57 +8401,57 @@ msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -8660,7 +8677,7 @@ msgstr "no s'ha trobat la clau pública"
 msgid "No argument allowed"
 msgstr ""
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8670,163 +8687,163 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nom_del_fitxer]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no s'ha creat l'anell: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
@@ -8842,6 +8859,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Ordre> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
diff --git a/po/cs.po b/po/cs.po
index f03635c56..62b4b717a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 2.0.11-r5164\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2009-09-29 15:47+0200\n"
 "Last-Translator: Petr Pisar <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -36,14 +36,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "získání zámku pinetry se nezdařilo: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -53,56 +65,56 @@ msgstr "Kvalita:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvalita textu zde zadaného.\n"
 "Na podrobnosti ohledně kritérií se zeptejte svého správce."
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klíč"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pokus %d z %d)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN je příliš dlouhý"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "Heslo je příliš dlouhé"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak v PINu"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN je příliš krátký"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "Špatný PIN"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Heslo"
 
@@ -111,7 +123,7 @@ msgstr "Heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -121,12 +133,12 @@ msgstr "nemohu vytvořit „%s“: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otevřít „%s“: %s\n"
@@ -182,7 +194,7 @@ msgstr ""
 "0Auvnitř úložiště klíčů gpg-agenta"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
@@ -339,7 +351,7 @@ msgstr "Prosím, pro ochranu svého nového klíče%0A zadejte heslo"
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -348,115 +360,115 @@ msgstr ""
 "@Volby:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "běžet v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "běžen v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "s dodatečnými informacemi"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|načíst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "neuzurpovat si klávesnici a myš"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "použít pro server soubor s protokolem"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "použít standardní umístění socketu"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "dovolit klientům označit klíče za „důvěryhodné“"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "zapnout emulaci ssh-agenta"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|SOUBOR|zapsat nastavení prostředí též do SOUBORU"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
 "připomínky k překladu hlaste (česky) na <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Použití: gpg-agent [VOLBY] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -464,145 +476,145 @@ msgstr ""
 "Syntaxe: gpg-agent [VOLBY] [PŘÍKAZ [ARGUMENTY]]\n"
 "Správa tajných klíčů pro GnuPG\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s je příliš stará (potřebuji %s, mám %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZNÁMKA: neexistuje implicitní soubor s možnostmi „%s“\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s možnostmi „%s“: %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "čtu možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba při vytváření „%s“: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "název socketu je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvořit socket: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent již běží – nový nebude spuštěn\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "chyba při získání náhodného řetězce pro socket\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba při přilepování socketu na „%s“: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "služba listen() selhala: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "naslouchám na socketu „%s“\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() na „%s“ selhal: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba při čtení náhodného řetězce z fd %d: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select selhala: %s – čekám 1 s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "špatný formát proměnné prostředí GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d není podporován\n"
@@ -619,7 +631,7 @@ msgstr ""
 "Syntaxe: gpg-preset-passphrase [VOLBY] KEYGRIP\n"
 "Správa dočasné paměti pro hesla\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -628,9 +640,9 @@ msgstr ""
 "@Příkazy:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -676,15 +688,15 @@ msgstr ""
 "Prosím, vložte heslo nebo PIN\n"
 "potřebný pro dokončení této operace."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "zrušeno\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba při ptaní se na heslo: %s\n"
@@ -947,11 +959,11 @@ msgstr "při pokusu alokovat %lu bajtů došla bezpečná paměť"
 msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "gpg-agent neběží – spouštím jej\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "k agentu se nelze připojit – zkouším náhradní způsob\n"
 
@@ -1598,9 +1610,9 @@ msgstr "ověř PIN a vypiš všechna data"
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokovat PIN pomocí resetačního kódu"
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Příkaz> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1622,12 +1634,12 @@ msgstr "Neplatný příkaz (zkuste „help“)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otevřít „%s“\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1911,7 +1923,7 @@ msgstr "Chybí otisk"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajný podklíč pro veřejný klíč %s – ignorováno\n"
@@ -1926,167 +1938,171 @@ msgstr "používám podklíč %s místo primárního klíče %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klíč %s: tajný klíč bez klíče veřejného – přeskočeno\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v čitelném dokumentu"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "šifrovat data"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vypsat seznam klíčů"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíčů a podpisů"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klíčů"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíčů a otisků"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíčů"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klíčů"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "vytvořit revokační certifikát"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíč ze souboru veřejných klíčů"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíč ze souboru tajných klíčů"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "podepsat klíč"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "podepsat klíč lokálně"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíč"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "vytvořit revokační certifikát"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "změnit heslo"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportovat klíče"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportovat klíče na server klíčů"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importovat klíče ze serveru klíčů"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "vyhledat klíče na serveru klíčů"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klíče ze serveru klíčů"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importovat/sloučit klíče"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvoř výstup zakódovaný pomocí ASCII"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "použít kanonický textový mód"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "použít chování striktně podle OpenPGP"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2094,7 +2110,7 @@ msgstr ""
 "@\n"
 "(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2112,11 +2128,11 @@ msgstr ""
 " --list-keys [jména]        vypsat klíče\n"
 " --fingerprint [jména]      vypsat otisky\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Použití: gpg [možnosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2126,7 +2142,7 @@ msgstr ""
 "podepsat, ověřit, šifrovat nebo dešifrovat\n"
 "implicitní operace závisí na vstupních datech\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2134,78 +2150,78 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Veřejný klíč: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Šifra: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "užití: gpg [možnosti]"
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví domovského adresáře není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví konfiguračního souboru není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví rozšiřujícího modulu není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva pro domovský adresáře nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva pro konfigurační soubor nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s domovským adresářem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2213,21 +2229,21 @@ msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s konfiguračním souborem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s rozšiřujícím modulem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva k adresáři s domovským adresářem nejsou nastavena "
 "bezpečně „%s“\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2235,7 +2251,7 @@ msgstr ""
 "VAROVÁNÍ: přístupová práva k adresáři s konfiguračním souborem nejsou "
 "nastavena bezpečně „%s“\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -2243,455 +2259,460 @@ msgstr ""
 "nastavena bezpečně „%s“\n"
 
 # c-format
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "neznámá konfigurační položka „%s“\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klíčů"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při výpisu podpisů"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "ukazovat odvolané a prošlé podklíče při výpisu klíčů"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klíči při výpisu klíčů"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZNÁMKA: starý implicitní soubor s možnostmi „%s“ ignorován\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s není pro normální použití!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíčů\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při ověřování podpisu"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "ověřovat podpisy s daty PKA"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s přepíše %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 můžete vytvářet pouze oddělené podpisy nebo podpisy čitelné "
 "jako text\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v módu --pgp2 nelze současně šifrovat a podepisovat\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v módu --pgp2 musíte použít soubor (ne rouru).\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "šifrování zpráv v módu --pgp2 vyžaduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí být větší než 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí být větší než 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkční s %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "použití šifrovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "použití hashovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "použití komprimačního algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --encrypt v módu %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --sign --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id uživatele"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id uživatele"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id uživatele [příkazy]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id uživatele"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíče se nepodařil: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Začněte psát svou zprávu ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikační politiku je neplatné\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
 
@@ -3473,8 +3494,8 @@ msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
 msgid "Really sign? (y/N) "
 msgstr "Skutečně podepsat? (a/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -3840,7 +3861,7 @@ msgstr "Ukončit bez uložení? (a/N) "
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajného klíče selhala: %s\n"
@@ -3849,91 +3870,91 @@ msgstr "aktualizace tajného klíče selhala: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento klíč revokoval %s klíčem %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klíč může být revokován %s klíčem %s "
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revokován: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skončila: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skončí: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Tento klíč byl označen za neplatný (disabled)"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "číslo karty: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3941,17 +3962,17 @@ msgstr ""
 "Prosím nezapomeňte, že zobrazované údaje o platnosti klíčů nemusí\n"
 "být nutně správné, dokud znova nespustíte program.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revokován"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "platnost skončila"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3959,7 +3980,7 @@ msgstr ""
 "VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3968,74 +3989,74 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
 "         verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smazán %d podpis.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4044,192 +4065,192 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
 "          verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor uživatele pověřeného revokací: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klíč již byl pověřen revokací\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROVÁNÍ: ustanovení klíče „pověřeným odvolatelem“ je nevratná operace!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 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:3581
+#: g10/keyedit.c:3647
 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:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Prosím, vyberte nejvýše jeden podklíč.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklíče.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klíče.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajných klíčů chybí odpovídající podpis\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podepisovací podklíč %s je již křížově certifikován\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "podklíč %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klíčů: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 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:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "Pokračovat (a/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklíč s indexem %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, 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:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíč\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již revokováno\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klíč %s je již revokován.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklíč %s je již revokován.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, 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"
@@ -6938,51 +6959,51 @@ msgstr "||Prosím, zadejte svůj PIN na klávesnici čtečky"
 msgid "|N|Initial New PIN"
 msgstr "|N|Prvotní nový PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "pracovat ve více serverové režimu (na popředí)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastavit úroveň ladění na ÚROVEŇ"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|připojit se na čtečku na portu N"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "NÁZEV|použít NÁZEV jako ovladač ct-API"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "NÁZEV|použít NÁZEV jako ovladač PC/SC"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "nepoužívat vnitřní ovladač CCID"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|odpojovat se od karty po N sekundách nečinnosti"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "nepoužívat klávesnici čtečky"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 msgid "deny the use of admin card commands"
 msgstr "zakázat používání správcovských příkazů karty"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Použití: scdaemon [možnosti] [SOUBORY] (-h pro nápovědu)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6990,17 +7011,17 @@ msgstr ""
 "Syntaxe: scdaemon [VOLBY] [PŘÍKAZ [ARGUMENTY]]\n"
 "Démon pro čipové karty (smartcard) pro GnuPG\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsluha pro deskriptor %d spuštěna\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukončena\n"
@@ -7015,21 +7036,21 @@ msgstr "neplatný radix64 znak %02x byl přeskočen\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "předání dotazu %s klientovi se nezdařilo\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "žádný dirmngr neběží – spouštím „%s“\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "špatný formát proměnné prostředí DIRMNGR_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokol dirmngr verze %d není podporován\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "k dirmngr se nelze připojit – zkouším náhradní způsob\n"
 
@@ -7587,10 +7608,6 @@ msgstr "předat příkaz do dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "vyvolat gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "změnit heslo"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "vytvářet výstup zakódovaný pomocí Base-64"
@@ -7722,25 +7739,25 @@ msgstr "%s:%u: zadáno heslo bez uživatele\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: přeskakuji tento řádek\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr "nelze rozebrat serveru klíčů\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importuji běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
 
@@ -7771,7 +7788,7 @@ msgstr "chyba při získání uložených příznaků: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "chyba při importování certifikátu: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba při čtení vstupu: %s\n"
@@ -7920,7 +7937,7 @@ msgstr "              alias"
 msgid "This is a qualified signature\n"
 msgstr "Toto je kvalifikovaný podpis\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "stručný výstup"
 
@@ -7952,11 +7969,11 @@ msgstr "|SOUBOR|spustit příkazy ze SOUBORU při startu"
 msgid "run /subst on startup"
 msgstr "spustit /subst při startu"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Použití: gpg-connect-agent [VOLBY] [SOUBORY] (-h pro nápovědu)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7964,45 +7981,45 @@ msgstr ""
 "Syntaxe: gpg-connect-agent [VOLBY]\n"
 "Připojí se na běžícího agenta a odesílá příkazy\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "volba „%s“ vyžaduje program a volitelné argumenty\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "volba „%s“ ignorovaná kvůli „%s“\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "přijímání řádku se nezdařilo: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "řádek je příliš dlouhý – přeskočen\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "řádek zkrácen, protože obsahoval znak \\0\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "neznámý příkaz „%s“\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "odesílání řádku selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba při odesílání příkazu %s: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
@@ -8220,7 +8237,7 @@ msgstr "Komponenta nenalezena"
 msgid "No argument allowed"
 msgstr "Žádné argumenty nejsou povoleny"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8230,35 +8247,35 @@ msgstr ""
 "Příkazy:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "dešifrovací modus"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "šifrovací modus"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "třída nástrojů (Konfucius)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "název souboru s programem"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "soubor s tajným klíčem (nezbytné)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "název vstupního souboru (implicitně standardní vstup)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Použití: symcryptrun [VOLBY]  (-h pro nápovědu)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8267,122 +8284,122 @@ msgstr ""
 "Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
 "[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s nad %s byl ukončen s kódem %i\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s nad %s selhal s kódem %i\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nemohu vytvořit dočasný adresář „%s“: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba při zápisu do %s: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba při čtení z %s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba při zavírání chyba %s: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "nebyla zadána volba --program\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "nebyla zadána volba --keyfile\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "nelze alokovat pole argumentů\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nelze vytvořit rouru: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "nelze vytvořit PTY: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "nelze se rozdvojit (fork): %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv selhalo: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "služba select() selhala: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "čtení selhalo: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "čtení z PTY selhalo: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "služba waitpid() selhala: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "potomek byl ukončen s kódem %i\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nelze alokovat řetězec infile: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nelze alokovat řetězec outfile: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "musí být zadáno buď %s, nebo %s\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "nezadána žádná třída\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "třída %s není podporována\n"
@@ -8400,6 +8417,9 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [VOLBY] SOUBOR_SE_VZOREM\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "Command> "
+#~ msgstr "Příkaz> "
+
 #~ 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"
 
diff --git a/po/da.po b/po/da.po
index e60c3f5f3..bf165c57b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -17,14 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # er det klogt at overs�tte TrustDB?
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -34,55 +46,55 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -92,7 +104,7 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "kan ikke oprette %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -312,7 +324,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -323,265 +335,265 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -597,7 +609,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -606,9 +618,9 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -649,16 +661,16 @@ msgid ""
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -920,11 +932,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1612,8 +1624,8 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
 msgstr ""
 
 #: g10/card-util.c:1861
@@ -1639,12 +1651,12 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1925,7 +1937,7 @@ msgstr "Fingeraftryk:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1940,185 +1952,190 @@ msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "Gener�r en annull�rbar certifikat"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "Gener�r en annull�rbar certifikat"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�ndr kodes�tningen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2138,12 +2155,12 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2153,7 +2170,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2161,566 +2178,571 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key bruger-id"
+
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -3486,8 +3508,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3883,7 +3905,7 @@ msgstr "Afslut uden at gemme? "
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
@@ -3892,23 +3914,23 @@ msgstr ""
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3916,374 +3938,374 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 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:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 #, 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:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 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:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, 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:4194
+#: g10/keyedit.c:4260
 #, 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:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 #, 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:4725
+#: g10/keyedit.c:4791
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, 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:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -6970,72 +6992,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Indtast bruger-id: "
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7050,21 +7072,21 @@ msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7650,11 +7672,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "�ndr kodes�tningen"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7795,26 +7812,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "%s: udelod: %s\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7848,7 +7865,7 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7990,7 +8007,7 @@ msgstr "              alias \""
 msgid "This is a qualified signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "afslut"
@@ -8024,57 +8041,57 @@ msgstr "|FILE|indl�s udvidelsesmodul FILE"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -8302,7 +8319,7 @@ msgstr "offentlig n�gle ikke fundet"
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8312,160 +8329,160 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr ""
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "krypt�r data"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
diff --git a/po/de.po b/po/de.po
index 55a0077f5..430fbdcfe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.14\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-02-17 18:08+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2010-02-17 18:11+0100\n"
 "Last-Translator: Werner Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
diff --git a/po/el.po b/po/el.po
index 657904269..bca2797ef 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -92,7 +104,7 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -310,7 +322,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -321,268 +333,268 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
@@ -598,7 +610,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -607,9 +619,9 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -653,17 +665,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -928,11 +940,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1625,9 +1637,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "������> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1652,12 +1664,12 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1963,7 +1975,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -1978,175 +1990,180 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "���������� ���� �������������� ���������"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "���������� ���� �������������� ���������"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "������ ��� ������ ������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2154,7 +2171,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2174,11 +2191,11 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2188,7 +2205,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2196,568 +2213,573 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key user-id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -3577,8 +3599,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3978,7 +4000,7 @@ msgstr "����������� ����� ����������; "
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
@@ -3987,93 +4009,93 @@ msgstr "� ��������� �������� �������: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4081,19 +4103,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4101,7 +4123,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4110,75 +4132,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4188,38 +4210,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4227,173 +4249,173 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   ����������� ��� %08lX ���� %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, 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"
@@ -7165,72 +7187,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7245,22 +7267,22 @@ msgstr "�� ������� radix64 ���������� %02x ���������\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7850,11 +7872,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "������ ��� ������ ������"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7994,26 +8011,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8046,7 +8063,7 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -8189,7 +8206,7 @@ msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "�����������"
@@ -8223,57 +8240,57 @@ msgstr "|������|������� ��� ���������� ��������� ������"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "� ������ ����� ���� ������\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
@@ -8500,7 +8517,7 @@ msgstr "��� ������� �� ������� ������"
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8510,162 +8527,162 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "���������������� OK\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "���������������� OK\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [����� �������]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
@@ -8681,6 +8698,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "������> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
diff --git a/po/eo.po b/po/eo.po
index 97cd6858c..8a9f5414d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -92,7 +104,7 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -311,7 +323,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -322,267 +334,267 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -598,7 +610,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -607,9 +619,9 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -653,17 +665,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -929,11 +941,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1632,9 +1644,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Komando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1659,12 +1671,12 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1951,7 +1963,7 @@ msgstr "Fingrospuro:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -1966,175 +1978,180 @@ msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "krei revokatestilon"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "krei revokatestilon"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�an�i la pasfrazon"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2142,7 +2159,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2162,11 +2179,11 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2176,7 +2193,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2184,565 +2201,570 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key uzantidentigilo"
+
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3563,8 +3585,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3964,7 +3986,7 @@ msgstr "�u fini sen skribi �an�ojn? "
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
@@ -3973,117 +3995,117 @@ msgstr "aktualigo de sekreto malsukcesis: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4092,75 +4114,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 #, 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -4170,206 +4192,206 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 #, 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:3433
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 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:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, 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:4194
+#: g10/keyedit.c:4260
 #, 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 #, 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:4725
+#: g10/keyedit.c:4791
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7118,72 +7140,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7198,22 +7220,22 @@ msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7816,11 +7838,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "�an�i la pasfrazon"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7960,26 +7977,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8012,7 +8029,7 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -8153,7 +8170,7 @@ msgstr "            alinome \""
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
@@ -8187,57 +8204,57 @@ msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -8464,7 +8481,7 @@ msgstr "publika �losilo ne trovita"
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8474,161 +8491,161 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "mal�ifrado sukcesis\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "mal�ifrado sukcesis\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [dosiero]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: uzanto ne trovita: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
@@ -8644,6 +8661,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Komando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
diff --git a/po/es.po b/po/es.po
index 81162cc6d..b97ff2d73 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-12-14 19:34+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -20,14 +20,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "plural: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -37,18 +49,18 @@ msgstr "Calidad:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesi�n"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -56,28 +68,28 @@ msgstr ""
 "Por favor introduzca la frase contrase�a para desbloquear la clave secreta "
 "de esta sesi�n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "Frase contrase�a demasiado larga"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inv�lidos en el PIN"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -90,7 +102,7 @@ msgstr "PIN incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a err�nea"
 
@@ -103,7 +115,7 @@ msgstr "Frase contrase�a err�nea"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Frase contrase�a"
 
@@ -112,7 +124,7 @@ msgstr "Frase contrase�a"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -122,12 +134,12 @@ msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -183,7 +195,7 @@ msgstr ""
 "secretarecibida%%0A  %s%%0Aen el almacen de claves del agente gpg"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "no coincide - reint�ntelo"
 
@@ -344,7 +356,7 @@ msgstr "Por favor introduzca frase contrase�a para%0Aproteger su nueva clave"
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contrase�a"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -353,114 +365,114 @@ msgstr ""
 "@Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "no acaparar teclado y rat�n"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "usar un fichero log para el servidor"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "usar una localizaci�n est�ndar para el socket"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la cach� expiran en N segundos"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el cach� de PINs al firmar"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "permitir que los clientes marquen claves como \"fiables\""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contrase�a"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "permitir emulaci�n de ssh-agent"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg-agent [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -468,146 +480,146 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "nombre de socket demasiado largo\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "el nombre de socket `%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ya hay un agente gpg ejecut�ndose - no se inicia otro\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor �nico para el socket\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enlazando el socket con `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escuchando el socket `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "no puede usar `%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select fall�: %s - espero 1s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, 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"
@@ -628,7 +640,7 @@ msgstr ""
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -637,9 +649,9 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -693,15 +705,15 @@ msgstr ""
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Frase contrase�a:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contrase�a: %s\n"
@@ -966,11 +978,11 @@ msgstr "agotado nucleo de memoria segura reservando %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria reservando %lu bytes"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "no hay gpg-agent en ejecuci�n - inicando uno\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "no puedo conectar con el agente - intentando retirada\n"
 
@@ -1618,9 +1630,9 @@ msgstr "verificar PIN y listar todos los datos"
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando C�digo de Reinicio"
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Orden> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1642,12 +1654,12 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1933,7 +1945,7 @@ msgstr "No hay huella dactilar"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
@@ -1948,163 +1960,167 @@ msgstr "usando subclave %s en vez de clave primaria %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "genera un certificado de revocaci�n"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "genera un certificado de revocaci�n"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "cambia una frase contrase�a"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr "imprime res�menes de mensaje"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID-USUARIO|cifra para ID-USUARIO"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 desactiva)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FICHERO|volcar salida en FICHERO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
@@ -2112,7 +2128,7 @@ msgstr "usar estilo OpenPGP estricto"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2120,7 +2136,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2140,11 +2156,11 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2154,7 +2170,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2162,71 +2178,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2234,18 +2250,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2253,438 +2269,443 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de pol�tica al listar firmas"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones est�ndar IETF al listar firmas"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es una fecha de caducidad v�lida\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de pol�tica al verificar firmas"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-usuario"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2692,19 +2713,19 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -3490,8 +3511,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3858,7 +3879,7 @@ msgstr "�Salir sin grabar? (s/N) "
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
@@ -3867,91 +3888,91 @@ msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3959,17 +3980,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3977,7 +3998,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3986,74 +4007,74 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "inv�lida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\": %d firma borrada\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4062,193 +4083,193 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya est� certificada en cruz\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y as� no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Introduzca la notaci�n: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "�Continuar? (s/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, 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:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@ -6968,52 +6989,52 @@ msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 msgid "|N|Initial New PIN"
 msgstr "|N|Nuevo PIN Inicial"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHERO|escribir log en FICHERO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|conectar el lector al puerto N"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como driver ct-API"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como driver PC/SC"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "no usa el driverd del CCID interno"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|desconectar la tarjeta despu�s de N segundos de inactividad"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "no usa el teclado del lector"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "permitir �rdenes de administrador en la tarjeta"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: scdaemon [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -7021,16 +7042,16 @@ msgstr ""
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para GnuPG\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "use la opci�n `--daemon' para ejectuar el programa en segundo plano\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
@@ -7045,21 +7066,21 @@ msgstr "caracter inv�lido radix64 %02x omitido\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "fallo al hacer la petici�n proxy %s al cliente\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "no hay dirmngr en ejecuci�n - iniciando `%s'\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de entorno DIRMNGR_INFO malformada\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versi�n del protocolo dirmngr %d no puede usarse\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
 
@@ -7621,10 +7642,6 @@ msgstr "pasar una orden a dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "cambia una frase contrase�a"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "crea una salida en base-64"
@@ -7762,25 +7779,25 @@ msgstr "%s:%u: se dio contrase�a sin usuario\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: omitir esta l�nea\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr "no se puede interpretar el servidor de claves\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inv�lida (no hay orden impl�cita)\n"
 
@@ -7811,7 +7828,7 @@ msgstr "error obteniendo par�metros almacenados: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo entrada: %s\n"
@@ -7957,7 +7974,7 @@ msgstr "                alias"
 msgid "This is a qualified signature\n"
 msgstr "Es una firma cualificada\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "silencioso"
 
@@ -7989,11 +8006,11 @@ msgstr "|FICHERO|ejecuta �rdenes de FICHERO al empezar"
 msgid "run /subst on startup"
 msgstr "ejecutar /subst al empezar"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg-connect-agent [opciones] (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -8001,45 +8018,45 @@ msgstr ""
 "Sintaxis: gpg-connect-agent [opciones]\n"
 "Conectar a un agente que se est� ejecutando y mandar �rdenes\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "la opci�n \"%s\" necesita un programa y par�metros opcionales\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "la opci�n \"%s\" se ignora por \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo recibiendo la l�nea: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "l�nea demasiado larga -omitida\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "l�nea acortada por culpa del caracter Nul inclu�do\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "orden desconocida `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallo mandando la l�nea: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error enviando orden %s: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones est�ndar: %s\n"
@@ -8261,7 +8278,7 @@ msgstr "No se permiten par�metros"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8271,35 +8288,35 @@ msgstr ""
 "�rdenes:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "modo de descifrado"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "modo de cifrado"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "clase de herramienta (confucius)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "nombre del programa"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "fichero de clave secreta (requerido)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "nombre del fichero de entrada (por defecto stdin)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: symcryptrun [opciones] (-h para ayuda)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8309,122 +8326,122 @@ msgstr ""
 "[opciones...] ORDEN [fichero entrada]\n"
 "Invocar una herramienta simple de cifrado sim�trico\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s en %s abort� con estado %i\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s en %s fall� con estado %i\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no se puede crear el directorio temporal `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no se puede abrir %s para escribir: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error escribiendo en %s: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error leyendo de %s: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "error cerrando %s: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "falta la opci�n --program\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "s�lo pueden usarse --decrypt y --encrypt\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "falta la opci�n --keyfile\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "no puedo reservar espacio para el vector de par�metros\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no se pudo crear la tuber�a: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "no se pudo crear pty: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "no se puede bifurcar: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv fallido: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select fallido: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "lectura fallida: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "lectura de pty fallida: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid fallido: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "proceso hijo abortado con estado %i\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "debe darse %s o bien %s\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "se necesita una clase\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "la clase %s no puede usarse\n"
@@ -8443,6 +8460,9 @@ msgstr ""
 "Compara frase contrase�a dada en entrada est�ndar con un fichero de "
 "patrones\n"
 
+#~ msgid "Command> "
+#~ msgstr "Orden> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
diff --git a/po/et.po b/po/et.po
index 6fb507c4d..8e9729a40 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -92,7 +104,7 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -310,7 +322,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -321,267 +333,267 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -597,7 +609,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -606,9 +618,9 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -652,17 +664,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -927,11 +939,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1623,9 +1635,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "K�sklus> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1650,12 +1662,12 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1954,7 +1966,7 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -1969,175 +1981,180 @@ msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "genereeri t�histamise sertifikaat"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "genereeri t�histamise sertifikaat"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muuda parooli"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2145,7 +2162,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2165,11 +2182,11 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2179,7 +2196,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2187,557 +2204,562 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key kasutaja-id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3547,8 +3569,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3946,7 +3968,7 @@ msgstr "V�ljun salvestamata? "
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
@@ -3955,93 +3977,93 @@ msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4049,19 +4071,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4069,7 +4091,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4078,75 +4100,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4155,202 +4177,202 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, 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"
@@ -7086,72 +7108,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7166,22 +7188,22 @@ msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7770,11 +7792,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "muuda parooli"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7914,26 +7931,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7966,7 +7983,7 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -8109,7 +8126,7 @@ msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "v�lju"
@@ -8143,57 +8160,57 @@ msgstr "|FAIL|lae laiendusmoodul FAIL"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -8420,7 +8437,7 @@ msgstr "ei leia avalikku v�tit"
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8430,162 +8447,162 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [failinimi]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
@@ -8601,6 +8618,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "K�sklus> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
diff --git a/po/fi.po b/po/fi.po
index 35631fc31..4581f4f23 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -30,14 +30,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -47,58 +59,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -108,7 +120,7 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -118,12 +130,12 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -176,7 +188,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -326,7 +338,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -337,268 +349,268 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -614,7 +626,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -623,9 +635,9 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -669,17 +681,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -944,11 +956,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1642,9 +1654,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Komento> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1669,12 +1681,12 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1970,7 +1982,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -1988,175 +2000,180 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "luo mitätöintivarmenne"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "luo mitätöintivarmenne"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muuta salasanaa"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2165,7 +2182,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2184,11 +2201,11 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2198,7 +2215,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2206,558 +2223,563 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key käyttäjätunnus"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3573,8 +3595,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3972,7 +3994,7 @@ msgstr "Lopeta tallentamatta muutoksia?"
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
@@ -3981,93 +4003,93 @@ msgstr "salaisen päivitys epäonnistui: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4075,19 +4097,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4095,7 +4117,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4104,75 +4126,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4182,204 +4204,204 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 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:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, 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:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, 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:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7150,72 +7172,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7230,22 +7252,22 @@ msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7834,11 +7856,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "muuta salasanaa"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7978,26 +7995,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8030,7 +8047,7 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -8173,7 +8190,7 @@ msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
@@ -8207,57 +8224,57 @@ msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -8484,7 +8501,7 @@ msgstr "julkista avainta ei löydy"
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8494,162 +8511,162 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [tiedostonimi]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tiedostoa %s ei voi avata: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
@@ -8665,6 +8682,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Komento> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
diff --git a/po/fr.po b/po/fr.po
index fc8cac85d..31b9526a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-09-30 19:38+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,14 +19,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "validit�: %s"
@@ -37,58 +49,58 @@ msgstr "validit�: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -98,7 +110,7 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -108,12 +120,12 @@ msgstr "impossible de cr�er `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -169,7 +181,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -330,7 +342,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -341,272 +353,272 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Signaler toutes anomalies � <@EMAIL@> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
@@ -622,7 +634,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -631,9 +643,9 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -677,17 +689,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -956,11 +968,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1636,9 +1648,9 @@ msgstr "v�rifier le code PIN et lister toutes les donn�es"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Commande> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1660,12 +1672,12 @@ msgstr "Commande invalide  (essayez �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1969,7 +1981,7 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
@@ -1986,174 +1998,179 @@ msgstr ""
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "g�n�rer un certificat de r�vocation"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "changer la phrase de passe"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2161,7 +2178,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2181,11 +2198,11 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2195,7 +2212,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2203,85 +2220,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2289,21 +2306,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2311,482 +2328,487 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key utilisateur"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 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"
 
@@ -3587,8 +3609,8 @@ msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3971,7 +3993,7 @@ msgstr "Quitter sans enregistrer ? (o/N) "
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
@@ -3980,23 +4002,23 @@ msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -4004,73 +4026,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4078,17 +4100,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4097,7 +4119,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4107,75 +4129,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4185,206 +4207,206 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 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:4194
+#: g10/keyedit.c:4260
 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, 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:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7183,69 +7205,69 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7260,22 +7282,22 @@ msgstr "caract�re %02X invalide en radix64 ignor�\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7869,11 +7891,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "changer la phrase de passe"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -8013,26 +8030,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8065,7 +8082,7 @@ msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -8212,7 +8229,7 @@ msgstr "                alias � %s �"
 msgid "This is a qualified signature\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "quitter"
@@ -8246,57 +8263,57 @@ msgstr "lire les options de `%s'\n"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
@@ -8524,7 +8541,7 @@ msgstr "cl� publique non trouv�e"
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8534,162 +8551,162 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nom du fichier]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
@@ -8705,6 +8722,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Commande> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
diff --git a/po/gl.po b/po/gl.po
index 2c9cd6c2f..084dd36b8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -92,7 +104,7 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -311,7 +323,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -322,271 +334,271 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, 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"
@@ -602,7 +614,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -611,9 +623,9 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -657,17 +669,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -932,11 +944,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1633,9 +1645,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Comando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1660,12 +1672,12 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1965,7 +1977,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1981,175 +1993,180 @@ msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "xerar un certificado de revocaci�n"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "xerar un certificado de revocaci�n"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2157,7 +2174,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2177,11 +2194,11 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2191,7 +2208,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2199,560 +2216,565 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-de-usuario"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -3571,8 +3593,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3978,7 +4000,7 @@ msgstr "�Sa�r sin gardar? "
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
@@ -3987,93 +4009,93 @@ msgstr "o segredo da actualizaci�n fallou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4081,19 +4103,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4101,7 +4123,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4110,77 +4132,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4190,209 +4212,209 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7155,72 +7177,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7235,22 +7257,22 @@ msgstr "car�cter radix64 non v�lido %02x omitido\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "erro ao p�r '%s' na base de datos de confianza: %s\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7852,11 +7874,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "cambia-lo contrasinal"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7996,26 +8013,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8048,7 +8065,7 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -8191,7 +8208,7 @@ msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
@@ -8225,57 +8242,57 @@ msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "li�a longa de m�is\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -8503,7 +8520,7 @@ msgstr "non se atopou a chave p�blica"
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8513,164 +8530,164 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [ficheiro]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: non se atopou o usuario: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
@@ -8686,6 +8703,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Comando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
diff --git a/po/hu.po b/po/hu.po
index a3a23ec9f..3a85ed798 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -92,7 +104,7 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -310,7 +322,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -321,267 +333,267 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
@@ -597,7 +609,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -606,9 +618,9 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -652,17 +664,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -927,11 +939,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1623,9 +1635,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Parancs> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1650,12 +1662,12 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1950,7 +1962,7 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1966,175 +1978,180 @@ msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "visszavon�si igazol�s k�sz�t�se"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "visszavon�si igazol�s k�sz�t�se"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "jelsz�v�ltoztat�s"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2142,7 +2159,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2162,11 +2179,11 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2176,7 +2193,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2184,558 +2201,563 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key felh-azonos�t�"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, 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"
@@ -3547,8 +3569,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3946,7 +3968,7 @@ msgstr "Kil�pjek ment�s n�lk�l? "
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
@@ -3955,93 +3977,93 @@ msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4049,19 +4071,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4069,7 +4091,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4079,75 +4101,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4157,204 +4179,204 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 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:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 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:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 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:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   al��rva %08lX �ltal %s%s id�pontban.\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, 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:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, 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"
@@ -7118,72 +7140,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7198,22 +7220,22 @@ msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7803,11 +7825,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "jelsz�v�ltoztat�s"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7947,26 +7964,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7999,7 +8016,7 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -8142,7 +8159,7 @@ msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "kil�p�s|kilepes"
@@ -8176,57 +8193,57 @@ msgstr "|f�jl|b�v�t� modul bet�lt�se"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "A sor t�l hossz�!\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
@@ -8453,7 +8470,7 @@ msgstr "nyilv�nos kulcs nem tal�lhat�"
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8463,162 +8480,162 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "Visszafejt�s rendben.\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "Visszafejt�s rendben.\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [f�jln�v]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
@@ -8634,6 +8651,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Parancs> "
+
 #~ 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"
 
diff --git a/po/id.po b/po/id.po
index b34d8fd74..ec2434449 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -16,14 +16,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -33,58 +45,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -94,7 +106,7 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -104,12 +116,12 @@ msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -162,7 +174,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -312,7 +324,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -323,267 +335,267 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -599,7 +611,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -608,9 +620,9 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -654,17 +666,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -929,11 +941,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1626,9 +1638,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Perintah> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1653,12 +1665,12 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1953,7 +1965,7 @@ msgstr "tampilkan fingerprint"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -1968,175 +1980,180 @@ msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "buat sertifikat revokasi"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "buat sertifikat revokasi"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "ubah passphrase"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2144,7 +2161,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2164,11 +2181,11 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2178,7 +2195,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2186,566 +2203,571 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-user"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3558,8 +3580,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3957,7 +3979,7 @@ msgstr "Berhenti tanpa menyimpan? "
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
@@ -3966,93 +3988,93 @@ msgstr "gagal perbarui rahasia: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4060,19 +4082,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4080,7 +4102,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4090,75 +4112,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4168,207 +4190,207 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, 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"
@@ -7112,72 +7134,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7192,22 +7214,22 @@ msgstr "karakter radix64 tidak valid %02x dilewati\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7797,11 +7819,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "ubah passphrase"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7941,26 +7958,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7993,7 +8010,7 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -8136,7 +8153,7 @@ msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
@@ -8170,57 +8187,57 @@ msgstr "|FILE|muat modul ekstensi FILE"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -8447,7 +8464,7 @@ msgstr "kunci publik tidak ditemukan"
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8457,162 +8474,162 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [namafile]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
@@ -8628,6 +8645,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Perintah> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
diff --git a/po/it.po b/po/it.po
index 9947703a5..83643646d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -14,14 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -31,58 +43,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -92,7 +104,7 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -160,7 +172,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -310,7 +322,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -321,267 +333,267 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
@@ -597,7 +609,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -606,9 +618,9 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -652,17 +664,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -927,11 +939,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1625,9 +1637,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Comando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1652,12 +1664,12 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1961,7 +1973,7 @@ msgstr "mostra le impronte digitali"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1977,175 +1989,180 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "genera un certificato di revoca"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "genera un certificato di revoca"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "cambia la passphrase"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2153,7 +2170,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2173,11 +2190,11 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2187,7 +2204,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2195,561 +2212,566 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key user-id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -3563,8 +3585,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3962,7 +3984,7 @@ msgstr "Esco senza salvare? "
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
@@ -3971,93 +3993,93 @@ msgstr "aggiornamento della chiave segreta fallito: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4066,19 +4088,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4087,7 +4109,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4096,76 +4118,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4175,212 +4197,212 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7158,72 +7180,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7238,22 +7260,22 @@ msgstr "Carattere radix64 non valido %02x saltato\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7842,11 +7864,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "cambia la passphrase"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7986,26 +8003,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = salta questa chiave\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8038,7 +8055,7 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -8181,7 +8198,7 @@ msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -8215,57 +8232,57 @@ msgstr "|FILE|carica il modulo di estensione FILE"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riga troppo lunga\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -8492,7 +8509,7 @@ msgstr "chiave pubblica non trovata"
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8502,162 +8519,162 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "decifratura corretta\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "decifratura corretta\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nomefile]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
@@ -8673,6 +8690,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Comando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
diff --git a/po/ja.po b/po/ja.po
index 30c303147..ab0ac6bac 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -17,14 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "ͭ����: %s"
@@ -35,58 +47,58 @@ msgstr "ͭ����: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -96,7 +108,7 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -106,12 +118,12 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -164,7 +176,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -320,7 +332,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -331,266 +343,266 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "�Х��򸫤Ĥ����� <@EMAIL@> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
@@ -606,7 +618,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -615,9 +627,9 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -661,17 +673,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -935,11 +947,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1607,9 +1619,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "���ޥ��> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1631,12 +1643,12 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1918,7 +1930,7 @@ msgstr "CA���: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -1933,178 +1945,183 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "���ѽ�̾�����"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "���������������"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "���������������"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2113,7 +2130,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2133,11 +2150,11 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2147,7 +2164,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2155,547 +2172,552 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key �桼����id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -3475,8 +3497,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3863,7 +3885,7 @@ msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
@@ -3872,23 +3894,23 @@ msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3896,71 +3918,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3968,17 +3990,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3986,7 +4008,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3995,75 +4017,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4072,195 +4094,195 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -6936,69 +6958,69 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "������PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7013,22 +7035,22 @@ msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7621,11 +7643,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "�ѥ��ե졼�����ѹ�"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7765,26 +7782,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7817,7 +7834,7 @@ msgstr "������PIN�μ������顼: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7958,7 +7975,7 @@ msgstr "                ��̾��%s��"
 msgid "This is a qualified signature\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7992,57 +8009,57 @@ msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
@@ -8268,7 +8285,7 @@ msgstr "�����������Ĥ���ޤ���"
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8278,162 +8295,162 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "���������\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "���������\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [�ե�����̾]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
@@ -8449,6 +8466,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "���ޥ��> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ�����"
diff --git a/po/nb.po b/po/nb.po
index c2e7cf088..ac79cf4ad 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -18,14 +18,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "gyldighet: %s"
@@ -36,57 +48,57 @@ msgstr "gyldighet: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -96,7 +108,7 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -106,12 +118,12 @@ msgstr "kan ikke opprette �%s�: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -164,7 +176,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -320,7 +332,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -331,265 +343,265 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -605,7 +617,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -614,9 +626,9 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -657,17 +669,17 @@ msgid ""
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -928,11 +940,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1595,9 +1607,9 @@ msgstr "bekrefte PIN og vise alle data"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Kommando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1619,12 +1631,12 @@ msgstr "Ugyldig kommando  (pr�v �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1912,7 +1924,7 @@ msgstr "CA-fingeravtrykk: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -1927,174 +1939,179 @@ msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "generere et opphevingssertifikat"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "generere et opphevingssertifikat"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "endre passfrasen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2102,7 +2119,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2122,11 +2139,11 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2136,7 +2153,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2144,72 +2161,72 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2217,20 +2234,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen �%"
 "s�\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2238,456 +2255,461 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key brukerid"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -3458,8 +3480,8 @@ msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3813,7 +3835,7 @@ msgstr "Avslutte uten � lagre? (j/N) "
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
@@ -3822,380 +3844,380 @@ msgstr "oppdatering av hemmelig mislyktes: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 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:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 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:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -6874,69 +6896,69 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6951,21 +6973,21 @@ msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7553,11 +7575,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "endre passfrasen"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7697,26 +7714,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7749,7 +7766,7 @@ msgstr "feil ved henting av ny PIN: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7890,7 +7907,7 @@ msgstr "                aka �%s�"
 msgid "This is a qualified signature\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "avslutt"
@@ -7924,57 +7941,57 @@ msgstr "leser valg fra �%s�\n"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
@@ -8199,7 +8216,7 @@ msgstr "fant ikke offentlig n�kkel"
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8209,162 +8226,162 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "kryptere data"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [filnavn]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ikke st�ttet"
@@ -8380,6 +8397,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Kommando> "
+
 #~ msgid "Please report bugs to <[email protected]>.\n"
 #~ msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
diff --git a/po/pl.po b/po/pl.po
index 0627cc9d6..60b7a786e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -19,14 +19,26 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie uda�o si� uzyska� blokady pinentry: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "poprawno��: %s"
@@ -37,53 +49,53 @@ msgstr "poprawno��: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Prosz� wprowadzi� sw�j PIN, �eby odblokowa� klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Prosz� wprowadzi� swoje has�o, �eby odblokowa� klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pr�ba %d z %d)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN zbyt d�ugi"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "Has�o zbyt d�ugie"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN zbyt kr�tki"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Niepoprawne has�o"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Has�o"
 
@@ -92,7 +104,7 @@ msgstr "Has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -161,7 +173,7 @@ msgstr ""
 "%0A w miejscu przechowywania kluczy gpg-agenta"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
 
@@ -322,7 +334,7 @@ msgstr "Prosz� wprowadzi� has�o do%0Azabezpieczenia swojego nowego klucza"
 msgid "Please enter the new passphrase"
 msgstr "Prosz� wprowadzi� nowe has�o"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -331,114 +343,114 @@ msgstr ""
 "@Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�w"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "wyj�cie polece� w stylu sh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "wyj�cie polece� w stylu csh"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "nie odczepianie od konsoli"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "nie przechwytywanie klawiatury i myszy"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "u�ycie pliku loga dla serwera"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "u�ycie standardowego po�o�enia gniazda"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "nie u�ywanie SCdaemona"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie ��da� zmiany TTY"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie ��da� zmiany ekranu X"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane has�o"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "w��czenie emulacji ssh-agenta"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg-agent [opcje] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -446,146 +458,146 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� gniazda: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ju� dzia�a - nie uruchamianie nowego\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nie mo�na u�y� ,,%s'' jako katalogu domowego\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "b��d odczytu z %s: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obs�uga 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
@@ -603,7 +615,7 @@ msgstr ""
 "Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pami�ci hase�\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -612,9 +624,9 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -659,15 +671,15 @@ msgstr ""
 "Prosz� wprowadzi� has�o lub PIN\n"
 "Potrzebny do zako�czenia tej operacji."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Has�o:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas pytania o has�o: %s\n"
@@ -930,12 +942,12 @@ msgstr "brak miejsca w bezpiecznej pami�ci podczas przydzielania %lu bajt�w"
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajt�w"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 #, fuzzy
 msgid "no running gpg-agent - starting one\n"
 msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 #, fuzzy
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
@@ -1601,9 +1613,9 @@ msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Polecenie> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1625,12 +1637,12 @@ msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1917,7 +1929,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s.\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pomini�ty\n"
@@ -1932,174 +1944,178 @@ msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "tworzenie certyfikatu uniewa�nienia klucza"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "tworzenie certyfikatu uniewa�nienia klucza"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "zmiana has�a"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "wy�wietlenie stanu karty"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "�cis�e zachowanie OpenPGP"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2107,7 +2123,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2129,11 +2145,11 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie klucze\n"
 " --fingerprint [nazwy]      pokazanie odcisk�w kluczy\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2143,7 +2159,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2151,76 +2167,76 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2228,21 +2244,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2250,465 +2266,470 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
 "podpis�w"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key nazwa u�ytkownika"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -3497,8 +3518,8 @@ msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3881,7 +3902,7 @@ msgstr "Wyj�� bez zapisania zmian? (t/N) "
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
@@ -3890,91 +3911,91 @@ msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz zosta� uniewa�niony %s przez klucz %s u�ytkownika %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s u�ytkownika %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "uniewa�niono: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "wygas�: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "u�ycie: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "poprawno��: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3982,17 +4003,17 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "uniewa�niony"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "wygas�"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4001,7 +4022,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4010,74 +4031,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis�w wyczyszczonych\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4087,195 +4108,195 @@ msgstr ""
 "             uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisuj�cy, wi�c nie musi by� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usun��? (t/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "Kontynuowa�? (t/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator u�ytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (podpis nieuniewa�nialny) "
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7004,53 +7025,53 @@ msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 msgid "|N|Initial New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|po��czenie z czytnikiem na porcie N"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika ct-API"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika PC/SC"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "nie u�ywanie wewn�trznego sterownika CCID"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "nie u�ywanie klawiatury czytnika"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "zezwolenie na u�ycie polece� karty administratora"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: scdaemon [opcje] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -7058,16 +7079,16 @@ msgstr ""
 "Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla GnuPG\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "prosz� u�y� opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obs�uga fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obs�uga fd %d zako�czona\n"
@@ -7082,21 +7103,21 @@ msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej DIRMNGR_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u dirmngr nie jest obs�ugiwana\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
 
@@ -7663,10 +7684,6 @@ msgstr "przekazanie polecenia do dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "wywo�anie gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "zmiana has�a"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyj�cia zakodowanego base-64"
@@ -7804,26 +7821,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "  p = pomini�cie tego klucza\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7855,7 +7872,7 @@ msgstr "b��d pobierania zapisanych flag: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "b��d importu certyfikatu: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu wej�cia: %s\n"
@@ -8003,7 +8020,7 @@ msgstr "                        alias"
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "cicho"
 
@@ -8036,11 +8053,11 @@ msgstr "|PLIK|odczyt opcji z PLIKU"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg-connect-agent [opcje] (-h podaje pomoc)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -8048,45 +8065,45 @@ msgstr ""
 "Sk�adnia: gpg-connect-agent [opcje]\n"
 "Po��czenie z dzia�aj�cym agentem i wysy�anie polece�\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argument�w\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "odbieranie linii nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "linia zbyt d�uga - pomini�ta\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linia skr�cona z powodu osadzonego znaku Nul\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "nieznane polecenie ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "wysy�anie linii nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "b��d wysy�ania polecenia %s: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "b��d wysy�ania standardowych opcji: %s\n"
@@ -8309,7 +8326,7 @@ msgstr "Nie znaleziono komponentu"
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8319,35 +8336,35 @@ msgstr ""
 "Polecenia:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "tryb deszyfrowania"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "tryb szyfrowania"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "klasa narz�dzia (confucius)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "nazwa programu"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "plik klucza tajnego (wymagany)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "nazwa pliku wej�ciowego (domy�lnie standardowe wej�cie)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Wywo�anie: symcryptrun [opcje] (-h podaje pomoc)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8357,122 +8374,122 @@ msgstr ""
 "[opcje...] POLECENIE [plik-we�ciowy]\n"
 "Wywo�anie prostego narz�dzia do szyfrowania symetrycznego\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s na %s przerwany ze stanem %i\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s na %s nie powi�d� si� ze stanem %i\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu tymczasowego,,%s'': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nie uda�o si� otworzy� %s do zapisu: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "b��d zapisu do %s: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "b��d odczytu z %s: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "b��d zamykania %s: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "nie podano opcji --program\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "obs�ugiwane s� tylko --decrypt i --encrypt\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "nie podano opcji --keyfile\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "nie mo�na przydzieli� wektora args\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nie uda�o si� utworzy� potoku: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "nie uda�o si� utworzy� pty: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "nie uda�o si� wykona� fork: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "odczyt nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "odczyt pty nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "potomek zosta� przerwany ze stanem %i\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nie mo�na przydzieli� �a�cucha pliku wej�ciowego: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nie mo�na przydzieli� �a�cucha pliku wyj�ciowego: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "musi by� podane %s lub %s\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "nie podano klasy\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klasa %s nie jest obs�ugiwana\n"
@@ -8488,6 +8505,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Polecenie> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
diff --git a/po/pt.po b/po/pt.po
index 887f427d5..8a96adcaf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -17,14 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -34,58 +46,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -95,7 +107,7 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -105,12 +117,12 @@ msgstr "imposs�vel criar `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -163,7 +175,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -313,7 +325,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -324,268 +336,268 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, 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"
@@ -601,7 +613,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -610,9 +622,9 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -656,17 +668,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -932,11 +944,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1629,9 +1641,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Comando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1656,12 +1668,12 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1955,7 +1967,7 @@ msgstr "mostra impress�o digital"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
@@ -1970,179 +1982,184 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "gerar um certificado de revoga��o"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "gerar um certificado de revoga��o"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muda a frase secreta"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2150,7 +2167,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2170,11 +2187,11 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2184,7 +2201,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2192,559 +2209,564 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-utilizador"
+
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -3557,8 +3579,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3960,7 +3982,7 @@ msgstr "Sair sem gravar? "
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
@@ -3969,93 +3991,93 @@ msgstr "actualiza��o da chave secreta falhou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4063,25 +4085,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4090,76 +4112,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4168,203 +4190,203 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 #, 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, 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:4194
+#: g10/keyedit.c:4260
 #, 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7122,72 +7144,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7202,22 +7224,22 @@ msgstr "caracter radix64 inv�lido %02x ignorado\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7809,11 +7831,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "muda a frase secreta"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7955,26 +7972,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8007,7 +8024,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -8150,7 +8167,7 @@ msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -8184,57 +8201,57 @@ msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -8463,7 +8480,7 @@ msgstr "chave p�blica n�o encontrada"
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8473,161 +8490,161 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nome_do_ficheiro]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
@@ -8643,6 +8660,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Comando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "A base de dados de confian�a est� danificada; por favor execute\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 795454392..325bbcf5b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,14 +21,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -38,58 +50,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -99,7 +111,7 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -109,12 +121,12 @@ msgstr "imposs�vel criar %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -167,7 +179,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -318,7 +330,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -329,265 +341,265 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
@@ -603,7 +615,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -612,9 +624,9 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -658,16 +670,16 @@ msgid ""
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -931,11 +943,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1637,9 +1649,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Comando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1665,12 +1677,12 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1960,7 +1972,7 @@ msgstr "Impress�o digital:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -1975,191 +1987,196 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "gerar um certificado de revoga��o"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "gerar um certificado de revoga��o"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muda a frase secreta"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "imprime todos os \"digests\" de mensagens"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2179,11 +2196,11 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2193,7 +2210,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2201,569 +2218,574 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-usu�rio"
+
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -3562,8 +3584,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3966,7 +3988,7 @@ msgstr "Sair sem salvar? "
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
@@ -3975,398 +3997,398 @@ msgstr "atualiza��o da chave secreta falhou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 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:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 #, 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:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 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:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, 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:4194
+#: g10/keyedit.c:4260
 #, 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 #, 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:4725
+#: g10/keyedit.c:4791
 #, 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:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7130,72 +7152,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Digite o identificador de usu�rio: "
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7210,21 +7232,21 @@ msgstr "caractere radix64 inv�lido %02x ignorado\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7824,11 +7846,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "muda a frase secreta"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7968,26 +7985,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8020,7 +8037,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -8162,7 +8179,7 @@ msgid "This is a qualified signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
 # INICIO MENU
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -8196,57 +8213,57 @@ msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linha muito longa\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -8476,7 +8493,7 @@ msgstr "chave p�blica n�o encontrada"
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8486,161 +8503,161 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "descriptografia correta\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "descriptografia correta\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nome_do_arquivo]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usu�rio n�o encontrado: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
@@ -8656,6 +8673,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Comando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "O banco de dados de confiabilidade est� danificado; por favor rode\n"
diff --git a/po/ro.po b/po/ro.po
index c5c53a9ed..048f410ff 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -18,14 +18,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -36,17 +48,17 @@ msgstr "validitate: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -54,41 +66,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -98,7 +110,7 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -108,12 +120,12 @@ msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -167,7 +179,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -323,7 +335,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -334,267 +346,267 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -610,7 +622,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -619,9 +631,9 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -668,17 +680,17 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -942,11 +954,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1615,9 +1627,9 @@ msgstr "verific� PIN-ul �i listeaz� toate datele"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Comand�> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1639,12 +1651,12 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1936,7 +1948,7 @@ msgstr "Amprenta CA: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -1951,174 +1963,179 @@ msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "genereaz� un certificat de revocare"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "genereaz� un certificat de revocare"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "schimb� fraza-parol�"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2126,7 +2143,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2146,11 +2163,11 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2160,7 +2177,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2168,77 +2185,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2246,21 +2263,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2268,471 +2285,476 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id-utilizator"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -3520,8 +3542,8 @@ msgstr "Am verificat aceast� cheie foarte atent.\n"
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3896,7 +3918,7 @@ msgstr "Termina�i f�r� a salva?  (d/N) "
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
@@ -3905,92 +3927,92 @@ msgstr "actualizarea secretului a e�uat: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3999,17 +4021,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4018,7 +4040,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4027,74 +4049,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4104,200 +4126,200 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 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:4194
+#: g10/keyedit.c:4260
 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 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:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
@@ -7020,72 +7042,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7100,22 +7122,22 @@ msgstr "caracter radix64 invalid %02X s�rit\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7708,11 +7730,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "schimb� fraza-parol�"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7853,26 +7870,26 @@ msgid "%s:%u: skipping this line\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
 #
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7905,7 +7922,7 @@ msgstr "eroare la ob�inere noului PIN: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -8046,7 +8063,7 @@ msgstr "                aka \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "termin�"
@@ -8080,57 +8097,57 @@ msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linie prea lung�"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -8358,7 +8375,7 @@ msgstr "cheia public� nu a fost g�sit�"
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8368,162 +8385,162 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nume_fi�ier]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nu pot deschide %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
@@ -8539,6 +8556,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Comand�> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
diff --git a/po/ru.po b/po/ru.po
index c9adaf2a1..77302a0d8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.10\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-12-21 00:40+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -17,14 +17,26 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "Стойкость:"
 
@@ -34,54 +46,54 @@ msgstr "Стойкость:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойкость введенного выше текста. Можете прокосультироваться у Вашего "
 "администратора о критериях оценки стойкости."
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -90,7 +102,7 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -100,12 +112,12 @@ msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -159,7 +171,7 @@ msgstr ""
 "хранилища ключей gpg-agent"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
@@ -318,7 +330,7 @@ msgstr "Введите фразу-пароль%0Aдля защиты новог�
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -327,113 +339,113 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние окружения и в файл"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "О найденных ошибка сообщайте <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -441,145 +453,145 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s слишком устарело (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "имя сокета `%s' слишком длинное\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
@@ -597,7 +609,7 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметры] KEYGRIP\n"
 "Кеширование паролей\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -606,9 +618,9 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -652,15 +664,15 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
@@ -925,11 +937,11 @@ msgstr "выход за безопасный предел памяти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "нет работающих gpg-agent - запускаем\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
 
@@ -1575,9 +1587,9 @@ msgstr "проверить PIN и показать все данные"
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN используя Reset Code"
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Команда> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1599,12 +1611,12 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1886,7 +1898,7 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -1901,167 +1913,171 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "создать подпись"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "создать прозрачную подпись"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписи"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей c отпечатками"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "создать сертификат отзыва"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "создать сертификат отзыва"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "сменить фразу-пароль"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr "вывести хэши файлов"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать для USER-ID"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|использовать USER-ID для подписывания и расшифрования"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2069,7 +2085,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2089,11 +2105,11 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2103,7 +2119,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование.\n"
 "Действие по умолчанию зависит от входных данных.\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2111,92 +2127,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "  с открытым ключом: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "  симметричные шифры: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "  хэш-функции: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "  алгоритмы сжатия: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2204,460 +2220,465 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания при распечатке подписей"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать стандартные IETF примечания при распечатке подписей"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать предпочитаемый сервер ключей при распечатке подписей"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке ключей"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей при распечатке ключей"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения при распечатке подписей"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "отображать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "печатать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "печатать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "печатать стандартные IETF примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "печатать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "печатать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "печатать только главный User ID при проверке подписей"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key user-id"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[имяфайла]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -3438,8 +3459,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3803,7 +3824,7 @@ msgstr "Выйти без сохранения? (y/N)"
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
@@ -3812,91 +3833,91 @@ msgstr "сбой при обновлений секретного ключа: %s
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3904,17 +3925,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3922,7 +3943,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3931,74 +3952,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\": сжат: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\": %d подпись удалена\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\": %d удалено подписей\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\": уже минимизирован\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4007,191 +4028,191 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -6891,52 +6912,52 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|сохранять журнал в FILE"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|подключаться к считывателю на порт N"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "не использовать встроенный CCID драйвер"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|отсоединить карту по истечении N секунд неактивности"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "не использовать клавиатуру считывателя"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6944,17 +6965,17 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
@@ -6969,21 +6990,21 @@ msgstr "недопустимый символ radix64 %02X пропущен\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "нет запущеного dirmngr - запуск `%s'\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "протокол dirmngr версии %d не поддерживается\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
 
@@ -7543,10 +7564,6 @@ msgstr "передать команду dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "сменить фразу-пароль"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
@@ -7679,25 +7696,25 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: не обрабатываем эту строку\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr ""
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7728,7 +7745,7 @@ msgstr "ошибка получения сохраненных флагов: %s\
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7869,7 +7886,7 @@ msgstr "                aka"
 msgid "This is a qualified signature\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr ""
 
@@ -7901,11 +7918,11 @@ msgstr "|FILE|выполнить команды из FILE при запуске"
 msgid "run /subst on startup"
 msgstr "выполнить /substr при запуске"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Использование: gpg-connect-agent [параметры] (-h для подсказки)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7913,45 +7930,45 @@ msgstr ""
 "Синтаксис: gpg-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и отcылает команды\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "строка слишком длинная - пропущено\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "неизвестная команда `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "ошибка отправки %s команды: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
@@ -8169,7 +8186,7 @@ msgstr "Компонент не найден"
 msgid "No argument allowed"
 msgstr "Аргументы не разрешены"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8179,35 +8196,35 @@ msgstr ""
 "Команды:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "режим расшифрования"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "режим зашифровывания"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "файл секретного ключа (требуется)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "ввод имени файла (stdin по умолчанию)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Использование: symcryptrun [параметры] (-h для подсказки)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8217,122 +8234,122 @@ msgstr ""
 "[параметры...] COMMAND [файл-источник]\n"
 "Вызывает простой инструмент шифрования\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s над %s прервано, статус %i\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "сбой %s над %s, статус %i\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "невозможно создание временного каталога `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "невозможно открытие %s на запись: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "ошибка записи в %s: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "ошибка чтения из %s: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "ошибка закрытия %s: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "не задан параметр --program\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "не задан параметр --keyfile\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "потомок завершился, статус %i\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "следует задать %s либо %s\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "не задан класс\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "класс %s не поддерживается\n"
@@ -8348,6 +8365,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Команда> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
diff --git a/po/sk.po b/po/sk.po
index 3fdf4f5ad..c110e9a72 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -13,14 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr ""
 
@@ -30,58 +42,58 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -91,7 +103,7 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -101,12 +113,12 @@ msgstr "nem��em vytvori� `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -159,7 +171,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -309,7 +321,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -320,269 +332,269 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nem��em vytvori� adres�r: %s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
@@ -598,7 +610,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -607,9 +619,9 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -653,17 +665,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -928,11 +940,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1625,9 +1637,9 @@ msgstr ""
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Pr�kaz> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 #, fuzzy
@@ -1652,12 +1664,12 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1954,7 +1966,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -1969,179 +1981,184 @@ msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "vytvori� revoka�n� certifik�t"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "vytvori� revoka�n� certifik�t"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "zmeni� heslo"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2150,7 +2167,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2170,11 +2187,11 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2184,7 +2201,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2192,565 +2209,570 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key id u��vate�a"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -3569,8 +3591,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3968,7 +3990,7 @@ msgstr "Ukon�i� bez ulo�enia? "
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
@@ -3977,93 +3999,93 @@ msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, 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:2772
+#: g10/keyedit.c:2838
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4071,19 +4093,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4091,7 +4113,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4100,75 +4122,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4177,201 +4199,201 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 #, 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:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 #, 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:3581
+#: g10/keyedit.c:3647
 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:3587
+#: g10/keyedit.c:3653
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 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:3734
+#: g10/keyedit.c:3800
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 #, 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:4194
+#: g10/keyedit.c:4260
 #, 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:4256
+#: g10/keyedit.c:4322
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, 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:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   podp�san� %08lX v %s%s\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, 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:4808
+#: g10/keyedit.c:4874
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -7130,72 +7152,72 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7210,22 +7232,22 @@ msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7814,11 +7836,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "zmeni� heslo"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7962,26 +7979,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8014,7 +8031,7 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -8157,7 +8174,7 @@ msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�i�"
@@ -8191,57 +8208,57 @@ msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
@@ -8468,7 +8485,7 @@ msgstr "verejn� k��� nen�jden�"
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8478,162 +8495,162 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "de�ifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "de�ifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [meno s�boru]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nemo�no otvori� %s: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
@@ -8649,6 +8666,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "Pr�kaz> "
+
 #~ 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"
diff --git a/po/sv.po b/po/sv.po
index bdafb209b..61abe8aa7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -33,14 +33,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -50,7 +62,7 @@ msgstr "Kvalitet:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -59,7 +71,7 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -67,44 +79,44 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -115,7 +127,7 @@ msgstr "Lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -125,12 +137,12 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -184,7 +196,7 @@ msgstr ""
 "gpg-agents nyckellager"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -341,7 +353,7 @@ msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -350,115 +362,115 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -466,146 +478,146 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent är redan igång - startar inte en till\n"
 
 # Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
@@ -624,7 +636,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -634,9 +646,9 @@ msgstr ""
 " "
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -681,15 +693,15 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
@@ -957,11 +969,11 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "ingen körande gpg-agent - startar en\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
@@ -1616,9 +1628,9 @@ msgstr "validera PIN-koden och lista allt data"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Kommando> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1641,12 +1653,12 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1934,7 +1946,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
@@ -1949,176 +1961,180 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "generera ett spärrcertifikat"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "generera ett spärrcertifikat"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2126,7 +2142,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2146,12 +2162,12 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2161,7 +2177,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2169,74 +2185,74 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2244,19 +2260,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2264,470 +2280,475 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key användaridentitet"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -3521,8 +3542,8 @@ msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -3898,7 +3919,7 @@ msgstr "Avsluta utan att spara? (j/N) "
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
@@ -3907,93 +3928,93 @@ msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 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:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4001,17 +4022,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -4020,7 +4041,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4029,75 +4050,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 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:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4107,199 +4128,199 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 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:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
@@ -7077,53 +7098,53 @@ msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial PIN-kod"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -7131,16 +7152,16 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -7156,21 +7177,21 @@ msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "misslyckades med att förmedla %s-begäran till klient\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr-protokoll version %d stöds inte\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
@@ -7734,10 +7755,6 @@ msgstr "skicka ett kommando till dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "ändra en lösenfras"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
@@ -7872,25 +7889,25 @@ msgstr "%s:%u: lösenord angivet utan användare\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
@@ -7921,7 +7938,7 @@ msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -8071,7 +8088,7 @@ msgstr "      även känd som"
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "tyst"
 
@@ -8103,11 +8120,11 @@ msgstr "|FIL|kör kommandon från FIL vid uppstart"
 msgid "run /subst on startup"
 msgstr "kör /subst vid uppstart"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -8115,45 +8132,45 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
@@ -8371,7 +8388,7 @@ msgstr "Komponenten hittades inte"
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8381,35 +8398,35 @@ msgstr ""
 "Kommandon:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "dekrypteringsmodus"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "krypteringsmodus"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "verktygsklass (confucius)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "programfilnamn"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "hemlig nyckelfil (krävs)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8419,124 +8436,124 @@ msgstr ""
 "[flaggor...] KOMMANDO [inmatningsfil]\n"
 "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s på %s avbröts med status %i\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s på %s misslyckades med status %i\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "flaggan --program angavs inte\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "flaggan --keyfile angavs inte\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "kan inte allokera argumentvektor\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kunde inte skapa rör: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "kunde inte skapa pty: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "kunde inte grena process: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv misslyckades: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty-läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid misslyckades: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "barnprocess avbröts med status %i\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan inte allokera infilssträng: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "antingen %s eller %s måste anges\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
@@ -8553,6 +8570,9 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "Command> "
+#~ msgstr "Kommando> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
diff --git a/po/tr.po b/po/tr.po
index 9d68dd4c7..ff5b5782f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish\n"
@@ -17,14 +17,26 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -34,11 +46,11 @@ msgstr "Kalite:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,7 +58,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -54,36 +66,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -92,7 +104,7 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -102,12 +114,12 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -161,7 +173,7 @@ msgstr ""
 "için lütfen anahtar parolası giriniz"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -314,7 +326,7 @@ msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı girini
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -323,114 +335,114 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -438,145 +450,145 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -594,7 +606,7 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -603,9 +615,9 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -652,15 +664,15 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
@@ -925,11 +937,11 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
 
@@ -1575,9 +1587,9 @@ msgstr "PIN'i doğrular ve tüm veriyi listeler"
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "Komut> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1599,12 +1611,12 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1890,7 +1902,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1906,169 +1918,173 @@ msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "bir yürürlükten kaldırma sertifikası üretir"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "bir yürürlükten kaldırma sertifikası üretir"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "anahtar parolası değiştirir"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2076,7 +2092,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2096,11 +2112,11 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2110,7 +2126,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2118,549 +2134,554 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key kullanıcı-kimliği"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -3455,8 +3476,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3846,7 +3867,7 @@ msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
@@ -3855,94 +3876,94 @@ msgstr "gizliyi güncelleme başarısız: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "Özet: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 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:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3950,17 +3971,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3969,7 +3990,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3978,74 +3999,74 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 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:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4055,208 +4076,208 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 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:3433
+#: g10/keyedit.c:3499
 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:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 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:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 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:3640
+#: g10/keyedit.c:3706
 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:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, 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:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 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 veya y/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 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 veya "
 "y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 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 "
 "veya y/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, 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:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -6979,52 +7000,52 @@ msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 msgid "|N|Initial New PIN"
 msgstr "|N|İlk Yeni PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSYA|DOSYAya bir günce yazar"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -7032,18 +7053,18 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -7058,21 +7079,21 @@ msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 
@@ -7634,10 +7655,6 @@ msgstr "dirmngr'a bir komut aktarır"
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "anahtar parolası değiştirir"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
@@ -7771,25 +7788,25 @@ msgstr "%s:%u: kullanıcısız parola verilmiş\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: bu satır atlanıyor\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr "anahtar sunucusu çözümlenemedi\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
 
@@ -7820,7 +7837,7 @@ msgstr "saklanmış bayraklar alınırken hata: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7967,7 +7984,7 @@ msgstr "        nam-ı diğer"
 msgid "This is a qualified signature\n"
 msgstr "Bu bir nitelikli imzadır.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "sessiz"
 
@@ -7999,11 +8016,11 @@ msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
 msgid "run /subst on startup"
 msgstr "/subst başlangıçta çalıştırılır"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -8011,45 +8028,45 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik değiştirgeler gerektirir\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
@@ -8270,7 +8287,7 @@ msgstr "Bileşen yok"
 msgid "No argument allowed"
 msgstr "Değiştirgeye izin verilmez"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8280,35 +8297,35 @@ msgstr ""
 "Komutlar:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "şifre çözme kipi"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "şifreleme kipi"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "araç sınıfı (Konfüçyüs)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "program dosyaismi"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "gizli anahtar dosyası (gerekli)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "girdi dosyası ismi (std girdi öntanımlı)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8318,122 +8335,122 @@ msgstr ""
 "[seçenekler...] KOMUT [girdi-dosyası]\n"
 "Basit bir simetrik şifreleme aracı çalıştırır\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s yazmak için açılamadı: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "%s yazılırken hata: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "--program diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "--keyfile diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "boru oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "pty oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "çatallanamadı: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv başarısız: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty okuması başarısız: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid başarısız: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "alt süreç %i durumu ile çıktı\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "ya %s verilmeli ya da %s\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "hiç sınıf sağlanmamış\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "%s sınıfı desteklenmiyor\n"
@@ -8452,6 +8469,9 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "Command> "
+#~ msgstr "Komut> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr ""
 #~ "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e7827cc0..adf8440bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2009-07-09 10:03+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -19,14 +19,26 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 #, fuzzy
 msgid "Quality:"
 msgstr "有效性：%s"
@@ -37,58 +49,58 @@ msgstr "有效性：%s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -98,7 +110,7 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -108,12 +120,12 @@ msgstr "无法建立‘%s’：%s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -166,7 +178,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr ""
 
@@ -322,7 +334,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -333,268 +345,268 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "请向 <@EMAIL@> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -610,7 +622,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -619,9 +631,9 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -665,17 +677,17 @@ msgid ""
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -938,11 +950,11 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1607,9 +1619,9 @@ msgstr "验证 PIN 并列出所有数据"
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "命令> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1631,12 +1643,12 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1912,7 +1924,7 @@ msgstr "CA 指纹："
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1927,174 +1939,179 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "生成一份吊销证书"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "生成一份吊销证书"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+#, fuzzy
+msgid "change a passphrase"
+msgstr "更改密码"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 #, fuzzy
 msgid "print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2102,7 +2119,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2122,11 +2139,11 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2136,7 +2153,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2144,540 +2161,545 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key 用户标识"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -3446,8 +3468,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3809,7 +3831,7 @@ msgstr "要不保存而离开吗？(y/N)"
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
@@ -3818,114 +3840,114 @@ msgstr "更新私钥失败：%s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3934,74 +3956,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4010,197 +4032,197 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 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:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -6855,69 +6877,69 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "新的 PIN"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6932,22 +6954,22 @@ msgstr "跳过无效的 64 进制字符 %02x\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7538,11 +7560,6 @@ msgstr ""
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
-#, fuzzy
-msgid "change a passphrase"
-msgstr "更改密码"
-
 #: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
@@ -7682,26 +7699,26 @@ msgstr ""
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7734,7 +7751,7 @@ msgstr "获取新 PIN 时出错：%s\n"
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7875,7 +7892,7 @@ msgstr "              亦即“%s”"
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7909,57 +7926,57 @@ msgstr "从‘%s’读取选项\n"
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太长"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
@@ -8185,7 +8202,7 @@ msgstr "找不到公钥"
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 #, fuzzy
 msgid ""
 "@\n"
@@ -8195,162 +8212,162 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 #, fuzzy
 msgid "decryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "encryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 #, fuzzy
 msgid "program filename"
 msgstr "--store [文件名]"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "不支持远程调用\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "不支持保护散列 %d\n"
@@ -8366,6 +8383,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "Command> "
+#~ msgstr "命令> "
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cf58c6355..f70e9eb89 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-12-21 16:05+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2009-09-05 09:27+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -21,14 +21,26 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:243
+#: agent/call-pinentry.c:244
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries.  A underscore indicates that the next letter
+#. should be used as an accelerator.  The actual to be
+#. translated text starts after the second vertical bar.
+#: agent/call-pinentry.c:400
+msgid "|pinentry-label|_OK"
+msgstr ""
+
+#: agent/call-pinentry.c:401
+msgid "|pinentry-label|_Cancel"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:605
+#: agent/call-pinentry.c:644
 msgid "Quality:"
 msgstr "品質: %s"
 
@@ -38,54 +50,54 @@ msgstr "品質: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:627
+#: agent/call-pinentry.c:666
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "輸入在上面的文字的品質.\n"
 "關於此規範的細節, 請洽你的系統管理者."
 
-#: agent/call-pinentry.c:671
+#: agent/call-pinentry.c:710
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開密鑰"
 
-#: agent/call-pinentry.c:674
+#: agent/call-pinentry.c:713
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
-#: agent/call-pinentry.c:731
+#: agent/call-pinentry.c:770
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "設定錯誤 %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:751 agent/call-pinentry.c:763
+#: agent/call-pinentry.c:790 agent/call-pinentry.c:802
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
-#: agent/call-pinentry.c:752
+#: agent/call-pinentry.c:791
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:760
+#: agent/call-pinentry.c:799
 msgid "Invalid characters in PIN"
 msgstr "個人識別碼 (PIN) 含有無效的字符"
 
-#: agent/call-pinentry.c:765
+#: agent/call-pinentry.c:804
 msgid "PIN too short"
 msgstr "個人識別碼 (PIN) 太短"
 
-#: agent/call-pinentry.c:777
+#: agent/call-pinentry.c:816
 msgid "Bad PIN"
 msgstr "不良的個人識別碼 (PIN)"
 
-#: agent/call-pinentry.c:778
+#: agent/call-pinentry.c:817
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
-#: agent/call-pinentry.c:814
+#: agent/call-pinentry.c:853
 msgid "Passphrase"
 msgstr "密語"
 
@@ -94,7 +106,7 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
 #: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
 #: g10/tdbio.c:548 jnlib/dotlock.c:310
@@ -104,12 +116,12 @@ msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
-#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -161,7 +173,7 @@ msgid ""
 msgstr "請輸入密語以保護收到的私鑰%%0A   %s%%0A於 gpg-agent 的金鑰存放處"
 
 #: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
-#: tools/symcryptrun.c:434
+#: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
@@ -303,7 +315,7 @@ msgstr "請輸入密語至%0A以保護你的新金鑰"
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -312,113 +324,113 @@ msgstr ""
 "@選項:\n"
 " "
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "以服務模式執行 (背景)"
 
-#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
-#: tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從「檔案」中讀取選項"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:124
+#: agent/gpg-agent.c:131 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "不要奪取鍵盤及滑鼠"
 
-#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "為伺服器使用日誌檔"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "為 socket 使用標準的位置"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "不要使用 SCdaemon"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:154
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的要求"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的要求"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:159
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:172
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:174
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "允許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:176
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:177
 msgid "enable ssh-agent emulation"
 msgstr "啟用 ssh-agent 模擬"
 
-#: agent/gpg-agent.c:180
+#: agent/gpg-agent.c:179
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
-#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <[email protected]>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:341
+#: agent/gpg-agent.c:342
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:343
+#: agent/gpg-agent.c:344
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -426,145 +438,145 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
+#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
+#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
-#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
+#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1095 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1439 agent/gpg-agent.c:1557 agent/gpg-agent.c:1561
-#: agent/gpg-agent.c:1602 agent/gpg-agent.c:1606 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
+#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1029
+#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1476 scd/scdaemon.c:1052
+#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1503
+#: agent/gpg-agent.c:1510
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1514 scd/scdaemon.c:1071
+#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1519 scd/scdaemon.c:1074
+#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1531 scd/scdaemon.c:1083
+#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1537 scd/scdaemon.c:1090
+#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1565 agent/gpg-agent.c:1612 g10/openfile.c:432
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1618
+#: agent/gpg-agent.c:1625
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1622
+#: agent/gpg-agent.c:1629
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1752 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1781
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:1806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1944 scd/scdaemon.c:1243
+#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:2067 scd/scdaemon.c:1310
+#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:2195
+#: agent/gpg-agent.c:2210
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:2206 common/simple-pwquery.c:352 common/asshelp.c:283
-#: tools/gpg-connect-agent.c:2134
+#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:2219 common/simple-pwquery.c:364 common/asshelp.c:295
-#: tools/gpg-connect-agent.c:2145
+#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -581,7 +593,7 @@ msgstr ""
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -590,9 +602,9 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:156
 msgid ""
 "@\n"
 "Options:\n"
@@ -636,15 +648,15 @@ msgstr ""
 "請輸入完成這項操作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
@@ -902,11 +914,11 @@ msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
-#: common/asshelp.c:201 tools/gpg-connect-agent.c:2102
+#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "沒有執行中的 gpg-agent - 正在啟動一份\n"
 
-#: common/asshelp.c:306
+#: common/asshelp.c:314
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "無法連線至代理程式 - 正試著退回\n"
 
@@ -1548,9 +1560,9 @@ msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍個人識別碼 (PIN)"
 
-#: g10/card-util.c:1820 g10/keyedit.c:1654
-msgid "Command> "
-msgstr "指令> "
+#: g10/card-util.c:1820
+msgid "gpg/card> "
+msgstr ""
 
 #: g10/card-util.c:1861
 msgid "Admin-only command\n"
@@ -1572,12 +1584,12 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3448 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1852,7 +1864,7 @@ msgstr "沒有指紋"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3773
+#: g10/getkey.c:2533 g10/keyedit.c:3839
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -1867,167 +1879,171 @@ msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:376 sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:385 sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:389 sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:390 sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
-#: g10/gpg.c:393 sm/gpgsm.c:203
+#: g10/gpg.c:393
+msgid "generate a revocation certificate"
+msgstr "產生撤銷憑證"
+
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:400
-msgid "generate a revocation certificate"
-msgstr "產生撤銷憑證"
+#: g10/gpg.c:402 sm/gpgsm.c:215
+msgid "change a passphrase"
+msgstr "更改密語"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:403 sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:404 sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "從金鑰伺服器匯入金鑰"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "search for keys on a key server"
 msgstr "在金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺服器更新所有的金鑰"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:418
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:420
 msgid "change a card's PIN"
 msgstr "變更卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:436
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:437 sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:441 sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:444 sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以「使用者-ID」作為加密對象"
 
-#: g10/gpg.c:457 sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿「使用者-ID」來簽署或解密"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:462
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:466
+#: g10/gpg.c:468
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:483 sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至「檔案」"
 
-#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:502
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:554
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2035,7 +2051,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:586 sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2055,11 +2071,11 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:835
+#: g10/gpg.c:836
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:838
+#: g10/gpg.c:839
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2069,7 +2085,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:849 sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2077,539 +2093,544 @@ msgstr ""
 "\n"
 "已支援的演算法:\n"
 
-#: g10/gpg.c:852
+#: g10/gpg.c:853
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:859 g10/keyedit.c:2356
+#: g10/gpg.c:860 g10/keyedit.c:2422
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:866
+#: g10/gpg.c:867
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:873 g10/keyedit.c:2401
+#: g10/gpg.c:874 g10/keyedit.c:2467
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:943
+#: g10/gpg.c:944
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1157 sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1176
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1373
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1376
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1379
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1385
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1388
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1391
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1397
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1399
+#: g10/gpg.c:1400
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1403
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1409
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1411
+#: g10/gpg.c:1412
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1415
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1595
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1697
+#: g10/gpg.c:1699
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:1699
+#: g10/gpg.c:1701
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1703
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:1703
+#: g10/gpg.c:1705
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1709
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:1709
+#: g10/gpg.c:1711
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1713
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1715
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:1715
+#: g10/gpg.c:1717
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:1717
+#: g10/gpg.c:1719
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1721
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:1853
+#: g10/gpg.c:1855
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1945
+#: g10/gpg.c:1948
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
+#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2527 g10/gpg.c:2539
+#: g10/gpg.c:2534 g10/gpg.c:2546
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2628
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
+#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2663
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2666
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2673
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2676
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2686
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2696
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2704
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2706
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2708
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2703
+#: g10/gpg.c:2710
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2714
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2716
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2718
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2720
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2722
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2717
+#: g10/gpg.c:2724
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2726
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2733
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2736
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2743
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2929
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2925
+#: g10/gpg.c:2932
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3023 sm/gpgsm.c:1437
+#: g10/gpg.c:3030 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3034
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3043
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3046
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3061
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3075
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3081
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3087
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3100
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
+#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
+#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3179
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3185
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3200
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3202
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3204
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3206
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3201
+#: g10/gpg.c:3208
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3211
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3215
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3222
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3226
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3230
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3227
+#: g10/gpg.c:3234
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3267
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3314
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3319
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3324
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3410
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3421
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3442
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3449
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3451
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3454
+#: g10/gpg.c:3461
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3474
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3497
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3503
+#: g10/gpg.c:3510
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3525
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3527
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3523
+#: g10/gpg.c:3530
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3550
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3559
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3584
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3592
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3589
+#: g10/gpg.c:3596
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3610
+#: g10/gpg.c:3617
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3702
+#: g10/gpg.c:3633
+#, fuzzy
+msgid "--passwd <user-id>"
+msgstr "--sign-key 使用者ID"
+
+#: g10/gpg.c:3720
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3722
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3724
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3717
+#: g10/gpg.c:3735
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3745
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3778
+#: g10/gpg.c:3796
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3786
+#: g10/gpg.c:3804
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3876
+#: g10/gpg.c:3894
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:4009
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3995
+#: g10/gpg.c:4013
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4309
+#: g10/gpg.c:4327
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4311
+#: g10/gpg.c:4329
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4344
+#: g10/gpg.c:4362
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -3380,8 +3401,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4899 g10/keyedit.c:4990 g10/keyedit.c:5054
-#: g10/keyedit.c:5115 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
+#: g10/keyedit.c:5181 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -3742,7 +3763,7 @@ msgstr "要不儲存就離開嗎? (y/N) "
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2271
+#: g10/keyedit.c:2271 g10/keyedit.c:2352
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
@@ -3751,93 +3772,93 @@ msgstr "更新私鑰失敗: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2445
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2430
+#: g10/keyedit.c:2496
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2507
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2456 g10/keylist.c:314
+#: g10/keyedit.c:2522 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2464 g10/keyedit.c:2465
+#: g10/keyedit.c:2530 g10/keyedit.c:2531
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:2686
+#: g10/keyedit.c:2752
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2811
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2832
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2838
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2788 g10/keyedit.c:2844 g10/keyedit.c:2905 g10/keyedit.c:2920
+#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2791 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2793 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2795 g10/keyedit.c:2846 g10/keyedit.c:2907 g10/keyedit.c:2922
+#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:2797
+#: g10/keyedit.c:2863
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:2812
+#: g10/keyedit.c:2878
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2816
+#: g10/keyedit.c:2882
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2823
+#: g10/keyedit.c:2889
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2851 g10/keylist.c:206
+#: g10/keyedit.c:2917 g10/keylist.c:206
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2875
+#: g10/keyedit.c:2941
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3845,17 +3866,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:2939 g10/keyedit.c:3285 g10/keyserver.c:542
+#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2941 g10/keyedit.c:3287 g10/keyserver.c:546
+#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3072
 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"
@@ -3863,7 +3884,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3133
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3872,74 +3893,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3072 g10/keyedit.c:3407
+#: g10/keyedit.c:3138 g10/keyedit.c:3473
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3078
+#: g10/keyedit.c:3144
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3284
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3294
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3298
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3304
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3318
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3256
+#: g10/keyedit.c:3322
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3289 g10/trustdb.c:1732
+#: g10/keyedit.c:3355 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3291
+#: g10/keyedit.c:3357
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3364
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3373
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:3308
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3468
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3948,194 +3969,194 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3479
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3499
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3524
 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:3473
+#: g10/keyedit.c:3539
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3561
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3580
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3586
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3647
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3653
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把子鑰.\n"
 
-#: g10/keyedit.c:3591
+#: g10/keyedit.c:3657
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3660
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3706
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3656
+#: g10/keyedit.c:3722
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3800
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:3740
+#: g10/keyedit.c:3806
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:3903
+#: g10/keyedit.c:3969
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3942 g10/keyedit.c:4052 g10/keyedit.c:4172 g10/keyedit.c:4313
+#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4179
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4259
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4256
+#: g10/keyedit.c:4322
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4471
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:4477
+#: g10/keyedit.c:4543
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4538
+#: g10/keyedit.c:4604
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4573
+#: g10/keyedit.c:4639
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4774
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4711 g10/keyedit.c:4805 g10/keyedit.c:4848
+#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4713 g10/keyedit.c:4807 g10/keyedit.c:4850
+#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4717
+#: g10/keyedit.c:4783
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4787
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4725
+#: g10/keyedit.c:4791
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4842
 msgid "Not signed by you.\n"
 msgstr "並非由你所簽署.\n"
 
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4848
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4874
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4815
+#: g10/keyedit.c:4881
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4837
+#: g10/keyedit.c:4903
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4923
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4887
+#: g10/keyedit.c:4953
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4957
+#: g10/keyedit.c:5023
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:4974
+#: g10/keyedit.c:5040
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:5038
+#: g10/keyedit.c:5104
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5166
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5195
+#: g10/keyedit.c:5261
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -6778,51 +6799,51 @@ msgstr "||請在讀卡機鍵盤上輸入你的個人識別碼 (PIN)"
 msgid "|N|Initial New PIN"
 msgstr "|N|開始新增個人識別碼 (PIN)"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:118 sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為「等級」"
 
-#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|檔案|將日誌寫入至「檔案」"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|從 N 埠連線至讀卡機"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|名稱|使用「名稱」做為 ct-API 驅動程式"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|名稱|使用「名稱」做為 PC/SC 驅動程式"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "不要使用內部的 CCID 驅動程式"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "不要使用讀卡機鍵盤"
 
-#: scd/scdaemon.c:145
+#: scd/scdaemon.c:144
 msgid "deny the use of admin card commands"
 msgstr "禁用管理者卡片指令"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: scdaemon [選項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:260
+#: scd/scdaemon.c:261
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6830,16 +6851,16 @@ msgstr ""
 "語法: scdaemon [選項] [指令 [引數]]\n"
 "GnuPg 智慧卡服務\n"
 
-#: scd/scdaemon.c:761
+#: scd/scdaemon.c:767
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "請使用 `--daemon' 選項來將此程式執行於背景\n"
 
-#: scd/scdaemon.c:1115
+#: scd/scdaemon.c:1121
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程式已啟動\n"
 
-#: scd/scdaemon.c:1127
+#: scd/scdaemon.c:1133
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程式已終止\n"
@@ -6854,21 +6875,21 @@ msgstr "已跳過無效的 radix64 字符 %02x\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
 
-#: sm/call-dirmngr.c:234
+#: sm/call-dirmngr.c:245
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "沒有執行中的 dirmngr - 正在啟動 `%s'\n"
 
-#: sm/call-dirmngr.c:267
+#: sm/call-dirmngr.c:278
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "被變造的 DIRMNGR_INFO 環境變數\n"
 
-#: sm/call-dirmngr.c:279
+#: sm/call-dirmngr.c:290
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "未支援 dirmngr 協定版本 %d\n"
 
-#: sm/call-dirmngr.c:299
+#: sm/call-dirmngr.c:310
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "無法連線至 dirmngr - 正試著退回\n"
 
@@ -7423,10 +7444,6 @@ msgstr "將指令遞送給 dirmngr"
 msgid "invoke gpg-protect-tool"
 msgstr "叫用 gpg-protect-tool"
 
-#: sm/gpgsm.c:215
-msgid "change a passphrase"
-msgstr "更改密語"
-
 #: sm/gpgsm.c:230
 msgid "create base-64 encoded output"
 msgstr "建立以 base-64 編碼過的輸出"
@@ -7558,25 +7575,25 @@ msgstr "%s:%u: 給定的密碼沒有使用者\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳過這一列\n"
 
-#: sm/gpgsm.c:1374
+#: sm/gpgsm.c:1377
 msgid "could not parse keyserver\n"
 msgstr "無法剖析金鑰伺服器\n"
 
-#: sm/gpgsm.c:1454
+#: sm/gpgsm.c:1457
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: sm/gpgsm.c:1554
+#: sm/gpgsm.c:1557
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1595
+#: sm/gpgsm.c:1598
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法用 `%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
 
@@ -7607,7 +7624,7 @@ msgstr "取得已存放的旗標時出錯: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:678 tools/gpg-connect-agent.c:1329
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
@@ -7751,7 +7768,7 @@ msgstr "                亦即"
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "安靜模式"
 
@@ -7783,11 +7800,11 @@ msgstr "|檔案|啟動時執行「檔案」中的指令"
 msgid "run /subst on startup"
 msgstr "啟動時執行 /subst"
 
-#: tools/gpg-connect-agent.c:183
+#: tools/gpg-connect-agent.c:184
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法: gpg-connect-agent [選項] (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:186
+#: tools/gpg-connect-agent.c:187
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7795,45 +7812,45 @@ msgstr ""
 "語法: gpg-connect-agent [選項]\n"
 "連線至運作中的代理程式並送出指令\n"
 
-#: tools/gpg-connect-agent.c:1200
+#: tools/gpg-connect-agent.c:1201
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 
-#: tools/gpg-connect-agent.c:1209
+#: tools/gpg-connect-agent.c:1210
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:1354
+#: tools/gpg-connect-agent.c:1371
 msgid "line too long - skipped\n"
 msgstr "列太長 - 已跳過\n"
 
-#: tools/gpg-connect-agent.c:1358
+#: tools/gpg-connect-agent.c:1375
 msgid "line shortened due to embedded Nul character\n"
 msgstr "列因嵌入的 Nul 字符而縮短了\n"
 
-#: tools/gpg-connect-agent.c:1726
+#: tools/gpg-connect-agent.c:1743
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的指令 `%s'\n"
 
-#: tools/gpg-connect-agent.c:1744
+#: tools/gpg-connect-agent.c:1761
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "送出列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:2167
+#: tools/gpg-connect-agent.c:2208
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "送出 `%s' 指令時出錯: %s\n"
 
-#: tools/gpg-connect-agent.c:2182
+#: tools/gpg-connect-agent.c:2223
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %s\n"
@@ -8051,7 +8068,7 @@ msgstr "找不到元件"
 msgid "No argument allowed"
 msgstr "未允許使用引數"
 
-#: tools/symcryptrun.c:152
+#: tools/symcryptrun.c:151
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8061,35 +8078,35 @@ msgstr ""
 "指令:\n"
 " "
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:153
 msgid "decryption modus"
 msgstr "解密方式"
 
-#: tools/symcryptrun.c:155
+#: tools/symcryptrun.c:154
 msgid "encryption modus"
 msgstr "加密方式"
 
-#: tools/symcryptrun.c:159
+#: tools/symcryptrun.c:158
 msgid "tool class (confucius)"
 msgstr "工具類別 (confucius)"
 
-#: tools/symcryptrun.c:160
+#: tools/symcryptrun.c:159
 msgid "program filename"
 msgstr "程式檔名"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:161
 msgid "secret key file (required)"
 msgstr "私鑰檔案 (必要)"
 
-#: tools/symcryptrun.c:163
+#: tools/symcryptrun.c:162
 msgid "input file name (default stdin)"
 msgstr "輸入檔名 (預設是標準輸入)"
 
-#: tools/symcryptrun.c:207
+#: tools/symcryptrun.c:206
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
 
-#: tools/symcryptrun.c:210
+#: tools/symcryptrun.c:209
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -8099,122 +8116,122 @@ msgstr ""
 "令 [輸入檔案]\n"
 "叫用單純對稱式加密工具\n"
 
-#: tools/symcryptrun.c:279
+#: tools/symcryptrun.c:278
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 於 %s 以 %i 狀態中止了\n"
 
-#: tools/symcryptrun.c:286
+#: tools/symcryptrun.c:285
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s 於 %s 以 %i 狀態失敗了\n"
 
-#: tools/symcryptrun.c:312
+#: tools/symcryptrun.c:311
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "無法建立暫存目錄 `%s': %s\n"
 
-#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "無法開啟 %s 來寫入: %s\n"
 
-#: tools/symcryptrun.c:380
+#: tools/symcryptrun.c:379
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "寫入 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:387
+#: tools/symcryptrun.c:386
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "讀取 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:486
+#: tools/symcryptrun.c:485
 msgid "no --program option provided\n"
 msgstr "沒有提供 --program 選項\n"
 
-#: tools/symcryptrun.c:492
+#: tools/symcryptrun.c:491
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "祇支援 --decrypt 和 --encrypt\n"
 
-#: tools/symcryptrun.c:498
+#: tools/symcryptrun.c:497
 msgid "no --keyfile option provided\n"
 msgstr "沒有提供 --keyfile 選項\n"
 
-#: tools/symcryptrun.c:509
+#: tools/symcryptrun.c:508
 msgid "cannot allocate args vector\n"
 msgstr "無法配置引數向量\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:526
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "無法建立管道: %s\n"
 
-#: tools/symcryptrun.c:534
+#: tools/symcryptrun.c:533
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "無法建立 pty: %s\n"
 
-#: tools/symcryptrun.c:550
+#: tools/symcryptrun.c:549
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "無法衍生: %s\n"
 
-#: tools/symcryptrun.c:578
+#: tools/symcryptrun.c:577
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv 失敗: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:606
 #, c-format
 msgid "select failed: %s\n"
 msgstr "挑選失敗: %s\n"
 
-#: tools/symcryptrun.c:624
+#: tools/symcryptrun.c:623
 #, c-format
 msgid "read failed: %s\n"
 msgstr "讀取失敗: %s\n"
 
-#: tools/symcryptrun.c:676
+#: tools/symcryptrun.c:675
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty 讀取失敗: %s\n"
 
-#: tools/symcryptrun.c:728
+#: tools/symcryptrun.c:727
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid 失敗: %s\n"
 
-#: tools/symcryptrun.c:742
+#: tools/symcryptrun.c:741
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "子代以 %i 狀態中止了\n"
 
-#: tools/symcryptrun.c:797
+#: tools/symcryptrun.c:796
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "無法配置檔內字串: %s\n"
 
-#: tools/symcryptrun.c:810
+#: tools/symcryptrun.c:809
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "無法配置檔外字串: %s\n"
 
-#: tools/symcryptrun.c:984
+#: tools/symcryptrun.c:983
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "一定要給定 %s 或 %s 其中之一\n"
 
-#: tools/symcryptrun.c:1011
+#: tools/symcryptrun.c:1010
 msgid "no class provided\n"
 msgstr "沒有提供類別\n"
 
-#: tools/symcryptrun.c:1020
+#: tools/symcryptrun.c:1019
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "未支援 %s 類別\n"
@@ -8231,6 +8248,9 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "Command> "
+#~ msgstr "指令> "
+
 #~ msgid "Please report bugs to <[email protected]>.\n"
 #~ msgstr ""
 #~ "請向 <[email protected]> 回報程式瑕疵, 向 <[email protected]> 回報翻譯瑕疵.\n"